fc56e29a3ec22035c744e276538e8a20e5923996,server/src/com/cloud/api/ApiResponseHelper.java,ApiResponseHelper,createZoneResponse,#DataCenter#Boolean#,1012

Before Change


        }

        zoneResponse.setType(dataCenter.getNetworkType().toString());
        zoneResponse.setAllocationState(dataCenter.getAllocationState().toString());
        zoneResponse.setZoneToken(dataCenter.getZoneToken());
        zoneResponse.setDhcpProvider(dataCenter.getDhcpProvider());
        zoneResponse.setObjectName("zone");

After Change


        if (dataCenter.getNetworkType() != null) {
            zoneResponse.setType(dataCenter.getNetworkType().toString());
        }
        if (dataCenter.getAllocationState() != null) {
            zoneResponse.setAllocationState(dataCenter.getAllocationState().toString());
        }
        zoneResponse.setZoneToken(dataCenter.getZoneToken());
        zoneResponse.setDhcpProvider(dataCenter.getDhcpProvider());